Pin rustc to a date with known snapshots

I don't really expect all builders of cargo to be forced to use this rustc, and
I expect this to update frequently, but it will allow cargo PRs to land without
forcing a "put out the fires" fix for all nightly incompatibilities all at once.
This will allow rust upgrades to land separately and be reviewed separately.

diff --git a/.travis.install.deps.sh b/.travis.install.deps.sh
index c8396e39476ba94aedea350bf85c80c8f224563c..75891279140c724beff434c3252b485f04b4292c 100755 (executable)
--- a/.travis.install.deps.sh
+++ b/.travis.install.deps.sh
@@ -17,15 +17,15 @@ if [ "${TRAVIS}" = "true" ] && [ "${target}" = "unknown-linux-gnu" ]; then
     sudo apt-get install g++-multilib lib32stdc++6
 fi
 
-host=static-rust-lang-org.s3.amazonaws.com
+url=https://static-rust-lang-org.s3.amazonaws.com/dist/`cat src/rustversion.txt`
 
 # Install both 64 and 32 bit libraries. Apparently travis barfs if you try to
 # just install the right ones? This should enable cross compilation in the
 # future anyway.
 if [ -z "${windows}" ]; then
     rm -rf rustc *.tar.gz
-    curl -O https://$host/dist/rust-nightly-i686-$target.tar.gz
-    curl -O https://$host/dist/rust-nightly-x86_64-$target.tar.gz
+    curl -O $url/rust-nightly-i686-$target.tar.gz
+    curl -O $url/rust-nightly-x86_64-$target.tar.gz
     tar xfz rust-nightly-i686-$target.tar.gz
     tar xfz rust-nightly-x86_64-$target.tar.gz
 
@@ -54,7 +54,7 @@ else
     else
         triple=i686-pc-windows-gnu
     fi
-    curl -O http://$host/dist/rust-nightly-$triple.exe
+    curl -O $url/rust-nightly-$triple.exe
     innounp -y -x rust-nightly-$triple.exe
     mv '{app}' rustc
     # Don't use the bundled gcc, see rust-lang/rust#17442

diff --git a/src/rustversion.txt b/src/rustversion.txt
new file mode 100644 (file)
index 0000000..0a44487
--- /dev/null
+++ b/src/rustversion.txt
@@ -0,0 +1 @@
+2014-11-11

diff --git a/tests/test_cargo_compile_custom_build.rs b/tests/test_cargo_compile_custom_build.rs
index e11dfa6f1bb85b3641249777bc44584c4233a1cb..17c26b3c4d830b3e7c2135ae089b99eb9df2796d 100644 (file)
--- a/tests/test_cargo_compile_custom_build.rs
+++ b/tests/test_cargo_compile_custom_build.rs
@@ -781,6 +781,7 @@ test!(output_separate_lines {
 ", compiling = COMPILING, running = RUNNING).as_slice()));
 })
 
+#[cfg(not(windows))] // FIXME(#867)
 test!(code_generation {
     let p = project("foo")
         .file("Cargo.toml", r#"